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