Refactored failing tests