Tighten up two tests a tiny bit