Folds test back into the file again
Add blocktag map for indentation
more indentation work