Merge "Remove old manual test."