added test skipping based on roles
rewrote the test template
update Swift class parameters