PROBCORE-557 Integration test for consistency checking
minor changes (code cleanup)
clean up code
Integration test for SimpleTextCommand (PROBCORE-557)