Add module separations to unit tests