Re-add httmock