Did a very big test cleanup. All tests are passing