Added server tests and patched holes