Got failing tests down to 7....