moved push_timestamp to result_set
fixed tests.  commented out larger slow jobs test till we get better data.
code cleanup
made the slow job stest an xfail
merged conflict fix