Fixed tests because of the changes made to `Number` etc