Add changes for context variable step expansion
get context variable expansion working
get context variable expansion working
Add more context tests
Changes for a snapshot build with new chorus context variable step expansion