Fix failed unit tests