Fix old roles tests and rename to avoid conflicts