Delete test file + refactor