[#19][#20] replace unittest tainting by mock functions
fixtures tweaks
spaces..
Merge pull request #290 from JahPowerBit/develop

[#19][#20] replace unittest tainting by mock functions