tests refactored to pass tests