Tidied up and focused on existing tests -- Added first UI Test