fix tests and import paths