Fix unit tests that are not working yet