reorganized unit tests