(fix) Restructure routing a bit. Setup initial test