#basepkg-22 Tests restructured.