Fixed unit tests again