Comment and test name tweaks