more moves to time.Duration + fixed tests