Added testproject & Improved argument quoting