Remove superfluous tests
Refactoring tests