Move tests in to a class to reduce patch duplication.