Fixed tests
Merge pull request #43 from priyankarani/2.6-upstream

Fixed tests