Fixed tests
tidy