Tests pass, still need more coverage.