refactored failing tests