Fix namespace and so on in tests