t2: modified tests