Fix various tests

This allows "String" to be specified in yaml, rather than having to use `java.lang.String`, when specifying the sensor type being added.

I've changed the default to be `java.lang.String`, but will leave in the ugly check as folk will expect unqualified java.lang classes to "just work".