PSR2 formatting
fixed test for PHP 5.3
reorganized tests to reduce memory foot print