Minor fix to namespace-handler, more tests