Updated the serve target to cope with bundle.

  Also documented the test-target