Minor changes to the Gen VI test app.