cleanup
fix tests
v0.5.3