fix unit tests;
clean up unit test catalogs;
eliminate extra aliases