Updated tests after #80 fix