This doesn't fix tests but it does update what its supposed to cover.