Adding import / export tests. Fixing lock to use timeout in proper location. Optimizing code. Making PEP 8 compliant.