better testable kirby class