fix bug
added more tests
Merge branch 'feature/add-more-tests' into develop