A couple nil checks for good measure
Distinguish between tests