Renamed / Reorganized some unit tests