Fixed testsuites for datastructures
Merge pull request #324 from untitaker/sprint-branch

Fixed testsuites for datastructures