Changing project to be more like the others to hopefully get unit tests to run.