Add more tasks to setup for Tasks controller
Fix the new test setup
Fix the test methods to adjust for the new test setup (back to all-passing)