More work on tests; added coverage.