Adding some pending tests before I go to bed