Fixes Unit tests