added more dry-run tests and fixed some pending tests