Fixed Controller Spec failures