slightly modify tests