More Pages, Renamed Toolkit, More Tests

See Title