use bundle snapshot, test clean/fixes

tests should now pass when run under either java7 or java8.