Remove previously-existing tests in favor of new versions that are more complete and more appropriately named.