Update failing tests

Previously test execution was failing because of an errant :focus, and
two changes to the expected output from the latest session manager build
were not reflected in the tests. All these problems are addressed in
this change.
Merge branch 'fix-focus'