Update tests to conform to 3.x