Added pycharm settings.  Minor test updates.