Yang, refactor & use mockito