Progress towards testability (maybe I should use rspec?