minor unit test fixes,  small paranoia change, add comment