Merge "Adding compute server tests"