Fix package import errors. Removed obsolete tests