adding fixes for reachability testing