working on tests
Merge branch 'master' of https://github.com/noj33/JAB_project