Rename fn, add test