reorganized unit tests
more unit tests reorganization