Work on first UI tests