reorganize signatures of context add functions -- fix expectation error
add expectation failure formatting and merely fix it