Change Implementation of the volatile test to be more correct