Added back test code lost during merge.