New Tests; Upload controller changes