Proper fix (tm) for time values, test MUST working now