adjust test cases to namespace changes