fixes regression in previous commit, adds some more tests