Fixed some bugs with new path based testing