More functional test checking.
Mork work towards getting ui tests to work after refactor.