UT: Adding test cases and reformatting