improve tests with stubbing

?