fixed up tests for the new data structures
continuing changes; mostly syncing other areas of codebase