Refactored TimeController and added objenesis