Fixed issue with proxies in the changeset and extended unittest to check for event dispatch