namespace refactor
refactor tests