Adding more tests
Removing unused fixtures