Enhancements to initial commit;  Added test suite;