rename method; add test stubs