Update tests, add subpath routing