rename tests, use module for fixing stubs, rename method