Merge "More tidy up / test refactoring" am: c7cb936195 am: 8790934207
am: 7c4f14e1c3

Change-Id: I92010997fa99b13e4c3a9273a1c9c13448b04519