Switch to PSR4
Use templates in assertTaskHistory in tests