Mardii 2eme commit - Flavor unitests v1