Minor updates to reflect the new testing framework.