refs #180 remove deprecated test code
refs #180 remove deprecated test code
Merge remote-tracking branch 'origin/master' into sharding-cleanup