Fix for Draper changes failing the tests