Tighten up the tests a tad more