improved comments and minor tweak for test