Add new test case.
Merge branch 'master' into UserInterface