tighten up unit tests