Added server and test files