Ability to patch constructed and non-constructed calls separately
Added some initial unit tests