Minor update to EntityTest and some further experimentation on drag and drop