(No issue number; general updates to files for unit testing and prototyping)