Corrected broken unit tests