Parameteres parser

Solved some problems have found during tests
Implemented and adjusted some tests