Small changes in tests, as Maven does not recognize
"asserNotEuqals" and fails the test when encountering
it. Also fixed bug in TUI caused by fixing one of the
Sonar Errors.