A few more todos captured as pending tests