Bug Fixes in reachability tests