remove redundant -main; remove useless ns references in test