Improved test suite and typo