Fixes...
All fixed.Shell tests will be here soon.
checkstyle
added forgotten tableHolder
All fixed and shell tests added
checkstyle
Merge branch 'task-5' into task-6
Almost fixed