Fixed issue with SelectAllEvents and more unit test work