Merge "Add Unit Tests to Check Default Strategy Setup"