Unit tests all pass again, elements in baseresouerce reordered