fixed some import statements, added test code