extracted superclass to test server side code
Merge remote-tracking branch 'origin/master'