hive: merge 08-write-comprehensive-tests (squashed)