Agreed, testability is a big problem, I'll add a note. Thanks.