Finished adding getters to build model.js after changes; additional changes to test code.