Review changes to tests