Fix test case outputs
Adapt testsuit
Adapt testsuit
Adapt testsuit
Adapt testsuit
Correct chages
Merge pull request #40 from varkoly/master

Adapt testsuit