added new stuff, rename method, fix tests