add tests; make sure old and new data model boluses have a joinKey when they do connect with wizards, so they don't get visualized twice