correct base path and add tests