Fix testing errors, and refactor to decouple tests
Add info messages to show when things get created.