Testsuite: rewritten modules to simplify execution in different envs