Revert "Bug 21987: Add tests"