Add two more high level test

These tests are driven by expect, and test the whole
UI functionality