Fixed Test Location
Fixed Scheme
Merge remote-tracking branch 'origin/master'