Improve proxy tests