Update so tests run. WIP

6 Test Failures currently