More test coverage.

Added more test coverage, and started to break apart test coverage into
multiple files.