I did an amazing re-factor, I think the tests should pass

Change-Id: I910ea79164ba56304298b1e6af03394454016729
Merge "I did an amazing re-factor, I think the tests should pass"