Updated tests, now have to fix a new issue with self not being properly initialized when instrumenting selectors with more than one parameter