Fixed bad unit tests