make_tests: added tests
Merge branch 'make_tests'