Changing should[Not]Throw to did[Not]Throw which is more appropriate, wrapping assert calls in try/catch blocks inside callbacks