More testing fixes.
Remove role stuff.
Fix warnings!