Added missing tests & fixed Mask(-xxx)