fixing tests after structure refactor
Merge pull request #3 from salvin/TestsFix

fixing tests after structure refactor