Fix unittests
Fix unittests

this closes #574

greyfenrir/taurus,Blazemeter/taurus,Blazemeter/taurus,greyfenrir/taurus,greyfenrir/taurus,Blazemeter/taurus,Blazemeter/taurus,greyfenrir/taurus,greyfenrir/taurus,Blazemeter/taurus,greyfenrir/taurus,Blazemeter/taurus,greyfenrir/taurus,Blazemeter/taurus,greyfenrir/taurus,Blazemeter/taurus,greyfenrir/taurus,Blazemeter/taurus