Small changes to tests