Minor changes for getting unit tests going