UT: Resolving some test cases