Tidy up UTs
Add a UT to check the no-reactivate flag is only set for a correlating marker