Unit tests fixed after merge