Fix routing clashes when id matches new or edit
Fix mock test cases for the new routes used by the console