Fixed a few import paths and unit tests