Update tests

Some things had fallen out of date