cleaned up tests and routes