Removed hardcoded mocks and now utilize the product mock builder