test-check 2017-06-12

@alexmiller I'll start poking around with a collection sizing overhaul this week