Test cleanup

LlamaKit uses `??` instead of `!` to test optional values. I dig it.