Add an incomplete test case, fix references to old namespace