Adding unit tests for Server create changes