Here's a fix to unit tests