Minor changes to fix broken test