Included the arrowhead files and added a test