Removed usage of mock which wasn't really doing anything