fixing up import issues and tests