Add more Unit tests