Add fix for test