Improve tests, add zero-length block checks