Last unit tests to fix