Improved test suite + further implementation