Second refactoring for redundant code
Merge branch 'dev' of github.com:afarran/swm2m_avl_tests into dev