fix module load unit test + one very minor enhancement