added Tests, updated our classes and started with TUI