Fix bug proxy-ing method
Add the test that helped find the above bug :)