ENHANCEMENT: Added some tests and a suite