Removed old tests
made /role almost work...
Merge origin/Tomoe into Tomoe