Refactored testing suite to avoid dependency errors