Fixed the tests for real
Merge branch 'working_branch' of https://github.com/DSegal92/case_cycling_members into working_branch
Fixed a couple more tests.