patches for Core files
update test files
Merge pull request #134 from alain91/master

Two separate commits : Core patches and Tests files