Add JSON benchmark to server_test
Move fake app into a separate test file.
Merge branch 'master' into filters

Conflicts:
	fakeapp_test.go