Merge pull request #9684 from JosJuice/move-unit-tests UnitTests: Move some unit tests to where they should be
