Force type defuction on second make overload.
Added more test for expected.
Added conversion test for optional.