Updated Device.addState
Updated tests for Model