Merge "Add unit tests for UI"