#484 fixed failing tests

fixes #484