Adds some more debug logging
Refactored test to make it easier to read and add to.