Fixing feature test on travis and jenkins
Combining tests and making the proxie test more stable