made var names more understandable, added ability to set separatedly content for channels
Merge pull request #105 from YaroslavLitvinov/test-suite-makefile-improved-channels

made var names more understandable...