- Unit tests fixed to new structure