working on unit tests
working on mean fct
merged conflicts