updated to begin fixes for issue #90 and #119
updated test case and related data
updates to help resolve issue 119