Reviewed-by: sgehwolf, iklam
Reviewed-by: iignatyev, hseigel
Moved the tests, updated relevant files Reviewed-by: dholmes, iignatyev