complete the device model
rename device test file
get rid of the user model