undefined FILL_TESTS and some minor style fixes