adding tests and correcting imports