fixed tests
merged