Corrections to tests and templates