Fix some tests to call the right thing
Verify thrown exceptions' messages
Test that we detect circular dependencies