Unit & func grouped together
Merge pull request #19 from pepelsbey/dev

Unit & func tests grouped together