added test
mapped device and devicetype
mapped entities