Add additional logging and test cases.