test changes and integration