Some cleanup in comments ant test code