Fixed Unit tests