fixed tests
polishing