First set of changes to get unit tests working.