Reviewed-by: lmesnik, dholmes
Moved the tests, updated relevant files Reviewed-by: dholmes, iignatyev