Merge pull request #28 from prakhar1989/proxying

More tests
Deleted extra files