Fix checks on output for test cases
Merge pull request #58 from cyberious/TestFixes

Fix checks on output for test cases