Adds code implementation of end state, plus accompanying tests
Refactors end state test statment
Adds test for blank block
Adds todo for opts tests