Now fixed up tests given updated dependencies.