More test updates plus resolving some issues with setting up event subscribers/listeners in Shift