Added test-code.
  Ignore the test-scripts I've hacked up.