[#1002] Fix failing tests