Incorporated John's CR suggestion and added more tests
Incorp more CR suggestions
changes for suite tests to pass
add test suite code