test suite for 0.6 should run

broken into small commits for cherry-picking, in case you'd prefer not to merge all of this

suite currently failing (not sure if Travis will run)
additional commits pending