Fix tests

@localshred alright, should be green. Fixes #222