[#56493992] Test tool for System API and Push API (various fixes)