Quick fix for tests