Backed out failing test to refactor