moved 'serve' command over including tests