Added initial Masking Test & fixes for Xcode6-Beta6