Remove use of dict.fromkeys

Uses same object when generating a dict of dicts
Bug fixes and cleaning up after testing