Started adding tests for new proxy stuff