Update to tests due to change in syntax for role annotations.