Merge "Setup Unit Tests for SO"