Minor rename; add tests