fix broken tests + fix issue #31