adjustments to testing harness, fixes for issues 1,2 and 3