Addressing issue #66. 3 of the 4 tests now pass. The fourth tests has
been temporarily removed and will need further investigation