refactored tests - 2 failing