Updates to DispatchSharp to tidy testing