Reorganized unit tests and integration tests