single tests fixes