Added New DataBuilder, InputHandler
Refactor unit tests