Dropped unused upsertTests (see insertTests for upsert-tests)
Moved a few files.