Some more small test changes