Corrected tests and routes