improved testability, more tests
v0.0.4