small corrections of test system
Merge pull request #594 from ifilippov/testing

Incremental fixes for initial implementation of test system