Makes it much easier to write tests, and do potential further refactoring. Change-Id: I072951bb2bc87639e076d03c233f7283c0b175ff