Fix for tests breaking