Handle differing expected log behavior in pre-4.1
One more test patch to fix ordering issues
Merge pull request #17 from nathanlws/tweaks-for-4.1

Small tweaks for 4.1