#41 CallBaseWhen test fix
#110 replace PreserveStackTrace method implementation