#562 - fixes broken unit tests