Add pending tests. Add a couple modifications.