Minor tweaks to get tests running and some reorganization