comment cleanup in tests and some test adjustments