Two separate commits : Core patches and Tests files