Rename server to serve for cli usage
Tidy test directory