updated tests
Removed scenarios - too fragile
Much tidying up of the UI