Fixed tests to the new namespace.