Fix failing test after core class change

Fixes tests after 3795a80