Add temp fix for tests