Added More Unit tests