Updated tests to new naming.