Adapted tests and corrected wrong old imports