Fix more xmodule tests
Fix more tests