Fix some stuff to make test pass