UT: Adding test cases and reformatting
UT: Adding test cases and reformatting