preliminary fix for test setup