Updated and added tests

4 controller tests don't pass however.