Fix test, clean up