Added Controller class. Add inheritance to CharacterController. Update tests.