Reorganized unit tests.