Remove test view, make route logic more concise