fix module search path
fix module search path (for real)
fix tests