fix tests
tidy