Some small unit test additions