#265: moved unit-test related files to the UnitTest folder.

Also, accidentally committed whitespace corrections in the respective files.