removing stripped down test case copy and cleaning up with some utility methods