Updated Make for running tests locally and in CI