More tests and fix for time_in and time_out geting set to the same thing I think