More SafeNone tests
Reorganization