better namespace and fix test?