Fix namespace ref
Some tests