* modified tests
Merge branch 'master' of github.com:utopianami/2013_pythonServer