Updated Repository, Unit Tests, and controller code