Consolidated tests to be on module granularity.