Added proper test cases and rendering