Changes to support testing on host which are not configured with FQN