Tighten up some tests