Minor fixes make_expected. Added test fro make_expected_from_call