Fix things up - now builds and tests successfully