refactored some ignored tests