Updated tests after fixing #678