Some buig fixes
Added test shuffling to make the event testing setup phases run as the first tests