Added unit tests
Unit tests