A few more minor/test changes