Add replace function
Additional test files