This is complicated by the fact that much of this module requires mount. So for now just test the things that don't need mount. (cherry picked from commit 134a333d92)
134a333d92
