b=15924
i=johann

add a test case for bug 15924, combine flock tests code into a single file
flocks_test.c