Test branch

Added test.py and vcard fixture. Fixed import paths and minor tweaks.