Move some more tests over to the new testing framework.