Test Makefile fix
Factor out (basic) dynamic and articulation