Start of test coverage, currently about 50% covered.