Update tests according to namespace changes in previous commit