Reorganized test classes
Relaxed compatibility to PHP 5.4, again

This had been reverted while experimenting on a new functionality.