Merging startup environment with make test processand simplifying commands