uncomment final steps; fix test