This doesn't really do much yet in terms of test coverage, but it adds all related infrastructure Change-Id: If9fa66b6c5fbddd742ff61fa2c1345736d07accd