Added xmlns:xsi namespace and fixed tests