Refactor 

* clean up / refactoring on tests
* adding new `@Qualifiers` to keep impl clean
* reflecting new `@Qualifiers` in test