A few more fixes and got existing Unit Tests to run.