updating, refactoring tests