Minor changes to tests