PlayStore tests and refactoring for testability