removed some useless methods; refactoring tests