More tests for parameters extraction
Fixed failed tests