Don't need to convert that 0 to a time.Duration
Cleaned up tests, added tests for time scaling