Cleaned tests
More clean up