Fix the tests
Update a couple small things