Adding Phase Orange - changing tests + cleaning duplicated code
Extracting inner class in preparation of testing