added module namespace, and fixed broken tests