Moved test ops into test namespace

Also updated some comments