Enhance server tests