Keeping up with recent changes in Drupal core.
Fixed to-dos.
Test clean-up.