Test: Unit tests included Change-Id: If6e3cc70c65a8b179cb315cbfc95d300c92649d7
Test: Changes are currently independent of the rest of this project. Tests can currently manually be run with "make test". CL is large, but poses no risk Change-Id: Ia77e073df077257cab96b7ca4e1d99a900d029b2