fixed tests
And again