Reviewed-by: dholmes, bobv, mchung, sspitsyn
Moved the tests, updated relevant files Reviewed-by: dholmes, iignatyev