Re-added tests that were blown away in commit 02d803a783