Added tests with make test