Add versions, make tests pass