Unit tests added - Initial