Unit Tests added