Refactory tests, get rid of fucking flexmock! Yeah!!!