Couple comments and test function improvements.