Added getAndTouch() with tests