some generalization of response checking and test fixes