Removed ancient tests that have been replaced by newer tests.
Merge origin/master