Test module improvements