Added a __main__ to the package, so that we *can* run the unit tests properly.
Using relative imports in test.
Merged changes.