change tests around a bit