Fix accidentally broken unit tests