fixing roles in templates
modifying the test scheduling mechanism
bugfixes