Bugfix: update tests, fix import statements to use current paths.