Updating monkey patches to be slightly more elegant, adding tests to cover monkey patches