Deepened test penetration and a little commenting here and there