fix tests, cleanup
if-belt, stir 0.0.2