Added Scene creation flags/masks
Cosmetic changes to unit tests