Add Test, Improve Group, Database
Merge branch 'aurel' into develop
Clean files