Refactorings
More refactor
Finish refactoring
Remove previous function
Add test case for inheritance in UCC mode
Implement LBR test for inheritance