Refactory tests, get rid more flexmock, yeah