Really do tighten tests