Tests corrections
Merge pull request #12 from toptierlabs/tests_corrections

Tests corrections