modified tests and methods