added cucumber tests, updated factories, commented unused controller tests