Attempt to get test statuses to be updated
Fixed merge conflicts