Add tests for files not currently covered by tests.
Add tests for files not currently covered by tests.