better test coverage, but not done yet.