Improved PHPUnit implementation