adding more proxy tests and fixing some proxy bugs