Fix build. Move test's to run server on port 8585