More unittest, added mockery