Cleaning tests
More tests