Fix for broken unit tests