refactored tests to new name