Is there a unit-test for this branch?