Refactoring unnecessary tests