CHANGE-89 fix some tests. would fail depending on PHP_VERSION