Fix for broken unit test