Adapted tests and corrected wrong imports