Tried to repair tests (not working yet for Fake routes)