0.2.2 Improved test suite