Cleanup and back out failing test