Added a test, modified test make files