Adding unit tests
Adding unit tests