Update tests to cover wrapping scenario