fixed issue from pull request
#112: redoing the unit tests
#110: begin issue
#110: modified the method signatures
#112: fixed up some unit tests