More Unit Tests added