Fix for tracker_checking, removed Core tests