Fixed + added tests in TimeController