Sped up tests, fixed routes