Adding Unit tests