Fix upload ordering & test suite update
Add new test project