move support directory below test directory
amend references to support folder