Added further test cases, and committing user interface tests