tests: reorganized StubTest