Nawqaan 243

According to that sweet, sweet saga report, I've expanded coverage to 46%.

I haven't switched the registry class to be non-singleton. I'm on the fence on that design issue so I'd like to chat about that in person before proceeding.

In the mean time, how are the tests looking? What can I improve?