Readding test that was lost in the merge