Updated to latest boilerplate from:
https://logiclab.jira.com/wiki/display/OPEN/Test-Kwalitee