[46892367] refactor the controllers and corresponding specs