Optimization Test Mask Fields

Optimization Test Mask Fields. Sprint 9