tests comment fixes/cleanups