Some changes in order to RUN PHPUnit tests. Some work is needed in order
to let this library work.