Commit to pull Graham's changes, progress on tests