upgrade bundler, tweak/fix model tests, additional minor changes
rearrange/fix broken test cases