AS7-6525 test changes