siwtch error to repeated
clean up tests and mostly passing