Fixed some minor issues and refactored the specs of Controllers