Refactor + test project