added new test cases. Minor changes in GUI