Fixed imports for testing