fix test loader and use namespace