experimenting to fix the last two tests