Merge Mark's test code.