Split measurements from labs to Care Elements
Minor template and test fixes

Change-Id: I46fc35fd2b138f86d98f5ce9f854e9e42959b34c
Signed-off-by: Jeremy Ho <jujaga@gmail.com>