VID-2142 Update unit tests to use one of the new module classes