Refactored check_status_data and check_status_tools substantially.  Modified tests accordingly.