Marking 'test' as tests directory for server module
Reverting commit 2a2f00fac7cf76a70bf0abdac76cd4c471df7a13. Appropriate folders are already marked as test folders, was an issue with intellij v11
Merge remote-tracking branch 'upstream/master' into git-post-commit-hook