remove tester and stub to separate components