Add-refactor tests