Move back version
Update test to prepare for nested parsing development
Improve options to snippet functions
Begin nested snippet work