Tofe/work: Test stub update and improvement.