Updated tests to reflect renamings