Fix soup issues, update tests.
Version bump