fixed module use, fixed *'s in tests