Refactor gadget.xml to shim gapi for testing