CE-487 reverting test changes