small tests fixes