Updates tests
Adds Controllers
Updates travis