tests refactored to new method names. Added new tests