Adds fileconveyor test, updates plupload test, reorganizes some test buckets