Fixed the broken unit tests