Version 1.2:  Added Tests