Making little chages so some crashing test now are passing