issue-15-plus  more in depth testing, additional enhancements to test setup