structures & properties tests pass (need to revisit FIXME hack to structures)