Refactoring

- reduce redundancies in arrange phases of test methods
- reduce third party library type leakage