adapt specs for latest changes