Added proxy/options tests
Fixed examples