Finish off subrouters, more tests etc