fixed tests (at least under Windows) and unified formating