Updated tests to new namespace