Split long-running test and remove obsolete comments