tests fixed after merge