trainee/test and scheduled test; admin user improvements