A couple more tests and a script to manage.