Improved tests
v0.9.69