Refactoring wip
Refactoring in a ObservatoryListManager
Unit test refactoring