namespace changes (try to catch them all)
test fixes