[Graeme] Fixed failing tests due to missing expectations