Test module is upgraded. Several minor issues are fixed.