basic test changes and co