Remove server requirement and add local tests