added new Classes for Tests and TUI