Added make test and make test-dev targets