[General] Added unit tests