Additional test changes