Fixing unit tests. Not all are working for the moment...