Fix web-fragment.xml location and breaking Tests