PHP 5.2 test fixes
Renaming ehough_puzzle to just puzzle
PHP 5.2 fixes