Moved tests to reflect the namespace changes