Add unit tests

Add unit tests