Add unittest coverage for previous commit