Add block file tests.
Tidy test structure.