Add missing modules needed for tests to compile