Remove commented-out tests since they're handled elsewhere.
General cleanup.