Combine tests and restore columns dropped by hstore testing

Disabling the hstore extension during testing created order dependent
test failures.