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

so yes, you right, two-dimensional list is the cleanest way.. just make a push with this solution..