#214 fixing abundant null checks

fixed..
Committing this was accidental, right? I'm afreight we still need that in place be sure that different tests are cleanly separated from each other and won't have side-effects.