fixing named code blocks, fixing format of expected code