Merge "More Unit Tests for ci directory"