Tests are fixed and will run now