Added new test cases, UI formatting required