Fixed a typo in test name
Added some tests, taken first steps at refactoring the proxies