Fix tests in module/ suite