Fix failing tests

Fix failing tests due to changes introduced in
63b7d6b0454cd8ac4bbcbfe82f589f64581c82d7.