Fix failing tests and add test for Xblock external ui