Making Code More Testable – Breaking Static Dependencies