completed refactoring tests, removing older tests