Bug fix for test