Cleaned up packaging. Updated unittest harness.