[IN PROGRESS] Test framework fixes issue #95 

Working on this as a term project.