Update Makefile and use --user for testing.