Fix tests by creating Fork