Add some gotchas to tests and some further logging