Added test cases and UI testing