improve module info & unit tests