Working on tests and reforms
Merge pull request #285 from alassoued/dev

Working on tests and reforms