Tighten up testing to start getting 100% coverage on classes