added working user models, removed unused file for cloud tests