Feature phpunit refactor