Upgrade to include test files