Finish transferring tests into PHPUnit