testdata cleanup
fix file coding
support for @role syntax