Unit tests to fix