Fixes to get unit tests running