v2.3.1: Merge pull request #2 from Kunstmaan/fix-unit-tests-for-php53

fix unit tests for php 5.3

v2.3.0: Merge pull request #1 from wimvds/unit-tests

corrected / refactored / added unit tests