Add some pending tests