@wedaly I had already refactored these tests which you disabled yesterday. So I have re-enabled them. Okay to merge?