Added version code.

Change-Id: I7e7da2eb238dd6b80b778acec5a23945473f7a74
Fix up the test suite to actually all pass.

Change-Id: Ifc8b2442c03408f489b5f97936f3c9ff35eedca2