Updated tests with the new modifier names.