Added 50% Unit tests