Just a few test changes

Some minor changes.