Update test command to use new Makefile api
Add shell and run commands