Re-added tests that got lost in merge.