Fix alias tests
Fix test cases
Fix building controller tests