Tidied up tests
Merge branch 'master' into develop

Conflicts:
	test/test_server.rb