WICKET-5677 change onadd to onReAdd and only call when oninitialize wouldn't be called
WICKET-5677 clean up tests