Closes #8341
Adjust tests and build to run the unit tests again after the move. Closes #8363
see #7483.