Refactoring impl target
Adding app test
TBD