Added tests for phpunit, expanded hash key