Interim commit, laying out tests for feature blocks, etc.