Fixed rename role. Removed pointless tests.