Fixed tests to handle `should` API breakage.