Fix some tests on edx-west
Fix some more tests after merging