Fix tests with mock subgen