fixed time update calculation and updated tests.