Re-added legacy tests that had been misplaced