Add POJO unit tests from webshortcututil