data.expr fixup

Signed-off-by: Esben Haabendal <esben@haabendal.dk>
data.namespace unittest fixup

Signed-off-by: Esben Haabendal <esben@haabendal.dk>