Actually switch the usage of mock to be compatible