Minor refactoring in module tests, now executing commands is a bit easier