Fixed broken tests. Working on other tests still