Unit tests reorganization