Unit Tests added

Added a couple unit tests