Update tests to match the new namespace organization