Clean up of tests
Merge branch 'master' of github.com:ricallinson/php-keyval